Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 03:06:00 +0000 (20:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 03:06:00 +0000 (20:06 -0700)
commit1f54f645c58b11ec4e7b83de19defa9208e22e92
tree68df8361413ad1ff6a99e236ad391b9a1b7221f6
parentf49a135dac497642be9b201c205821a688475815
parent7bf270ae493e427f49aea17527d1f615f3dde43a
Merge from trunk.